<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <title>StatSVN - Directory datostp2012/src/utilidades/merge/</title>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
    <meta name="Generator" content="StatSVN 0.7.0"/>
<link rel="stylesheet" href="objectlab-statcvs.css" type="text/css"/>
<script type="text/javascript" charset="utf-8" src="http://bit.ly/javascript-api.js?version=latest&#38;login=statsvn&#38;apiKey=R_2c362b417d0517c27876cbaca1bb68cc"></script>
<script type="text/javascript" charset="utf-8">
   // wait until page is loaded to call API
   var redir_url;
   var short_url;
   BitlyCB.myShortenCallback = function(data) {
      // this is how to get a result of shortening a single url
      var result;
      short_url=null;
      for (var r in data.results) {
         result = data.results[r];
         result['longUrl'] = r;
         short_url = result['shortUrl'];
         break;
      }
      if (short_url==null) // bit.ly failed
      document.location=redir_url;
      else
      redirToTwitter();
   };
   function shortenTweet(url) {
      if (short_url == null || redir_url!=url) {
      redir_url = url;
      BitlyClient.shorten(document.location, 'BitlyCB.myShortenCallback');
      }
      else
      redirToTwitter();
      return false;
   }
   function redirToTwitter() { 
      // replace {0} which is visible as %7B0} in the link
      document.location = redir_url.replace('%7B0}', short_url);
   }
</script>
  </head>

<body>

<h1>Directory datostp2012/src/utilidades/merge/</h1>
<div id="parentlink">&#171; <a href="index.html">Development Statistics for /trunk</a></div>
<dl class="attributes">
    <dt>Directory Created:</dt>
    <dd><span class="date">2012-09-01 12:07</span></dd>
    <dt>Total Files:</dt>
    <dd>3</dd>
    <dt>Deleted Files:</dt>
    <dd>8</dd>
    <dt>Lines of Code:</dt>
    <dd>966</dd>
</dl>
<p class="dirtree">
<a href="dir.html">[root]</a>/<a href="dir_datostp2012.html">datostp2012</a>/<a href="dir_datostp2012_src.html">src</a>/<a href="dir_datostp2012_src_utilidades.html">utilidades</a>/<strong>merge</strong><br/>
</p>

<div class="section">
<h2>Lines of Code</h2>
<p class="chart"><img src="loc_module_datostp2012_src_utilidades_merge.png" alt="datostp2012/src/utilidades/merge/ Lines of Code" width="800" height="500" /></p></div>
<div class="section">
<h2>Developers</h2>
  <table  rules="groups" summary="All authors and the number of their changes and lines of code in this directory">
    <colgroup align="left"/>
    <colgroup align="right"/>
    <colgroup align="right"/>
    <colgroup align="right"/>
    <thead>
      <tr>
        <th>Author</th>
        <th>Changes</th>
        <th>Lines of Code</th>
        <th>Lines per Change</th>
      </tr>
    </thead>
    <tfoot>
      <tr>
        <th>Totals</th>
        <td>103 (100.0%)</td>
        <td>2672 (100.0%)</td>
        <td>25.9</td>
      </tr>
    </tfoot>
    <tbody>
      <tr  class="odd">
        <th><a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a></th>
        <td>87 (84.5%)</td>
        <td>2438 (91.2%)</td>
        <td>28.0</td>
      </tr>
      <tr  class="even">
        <th><a href="user_lucas.006@live.com.ar.html" class="author">lucas.006@live.com.ar</a></th>
        <td>13 (12.6%)</td>
        <td>210 (7.9%)</td>
        <td>16.1</td>
      </tr>
      <tr  class="odd">
        <th><a href="user_tomasboccardo@gmail.com.html" class="author">tomasboccardo@gmail.com</a></th>
        <td>3 (2.9%)</td>
        <td>24 (0.9%)</td>
        <td>8.0</td>
      </tr>
    </tbody>
  </table>

</div>
<div class="section">
<h2>Most Recent Commits</h2>
<dl class="commitlist">
  <dt><a name="40"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-29 14:15</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">178</span></span>
  </dt>
  <dd>
    <p class="comment">
Saco la funcion destruir subarchivos del merge. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>0</strong> lines of code changed in <span class="files">1 file</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(-25)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="39"></a>
    <a href="user_lucas.006@live.com.ar.html" class="author">lucas.006@live.com.ar</a>
    <span class="date">2012-09-28 13:19</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">172</span></span>
  </dt>
  <dd>
    <p class="comment">
Lucas - más tokens
    </p>
    <p class="commitdetails"><strong>1</strong> lines of code changed in <span class="files">1 file</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+1&#160;-1)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="38"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-28 12:40</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">171</span></span>
  </dt>
  <dd>
    <p class="comment">
Agrego funciones de peso. Modifico metadata de parser,merge y actualizo la construccion de las matrices en ambos formatos. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>3</strong> lines of code changed in <span class="files">1 file</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+3)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="37"></a>
    <a href="user_tomasboccardo@gmail.com.html" class="author">tomasboccardo@gmail.com</a>
    <span class="date">2012-09-27 07:55</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">166</span></span>
  </dt>
  <dd>
    <p class="comment">
Se agrego la funcion que genera el archivo matriz en el formato octave. Hay un warning que no puedo sacar, ya que por el formato resultante del merge, la entrada_metadata es innecesaria.
    </p>
    <p class="commitdetails"><strong>0</strong> lines of code changed in <span class="files">1 file</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        abb_avl.h&#160;<span class="del">(del)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="36"></a>
    <a href="user_lucas.006@live.com.ar.html" class="author">lucas.006@live.com.ar</a>
    <span class="date">2012-09-26 06:26</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">163</span></span>
  </dt>
  <dd>
    <p class="comment">
Lucas - Fix un par de bugs y agrego llamadas  system para svdlibc, parece andar errático usando las funciones. Appears to work
    </p>
    <p class="commitdetails"><strong>4</strong> lines of code changed in <span class="files">1 file</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+4&#160;-4)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="35"></a>
    <a href="user_tomasboccardo@gmail.com.html" class="author">tomasboccardo@gmail.com</a>
    <span class="date">2012-09-25 16:06</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">160</span></span>
  </dt>
  <dd>
    <p class="comment">
Se agrego el programa principal con interaccion al usuario por medio de la libreria getopt. Se modificarn los makefile par ahacer la compilacion del programa principal y de integracion menos "verbous". 
    </p>
    <p class="commitdetails"><strong>22</strong> lines of code changed in <span class="files">1 file</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+22&#160;-22)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="34"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-25 07:09</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">159</span></span>
  </dt>
  <dd>
    <p class="comment">
Agrego comentarios a mis tda y a la integracion. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>10</strong> lines of code changed in <span class="files">2 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+5)</span>,
        merge.h&#160;<span class="change">(+5)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="33"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-25 06:47</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">158</span></span>
  </dt>
  <dd>
    <p class="comment">
SEEEEEEEEEEEEEEEEEE NO PIERDE MAS MEMORIAAAAAAAAAAAAAAAAAAA!! Fucking debugging. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>5</strong> lines of code changed in <span class="files">1 file</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+5&#160;-2)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="32"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-25 05:13</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">156</span></span>
  </dt>
  <dd>
    <p class="comment">
Abstraigo todas las funciones auxiliares que defini en la integracion. Lo pongo en su respectivo lugar. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>113</strong> lines of code changed in <span class="files">2 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+103)</span>,
        merge.h&#160;<span class="change">(+10)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="31"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-23 10:26</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">151</span></span>
  </dt>
  <dd>
    <p class="comment">
Ahi ya consegui TODOS los campos de la matriz SVDLIBC. Cambie todo lo que dice int que encontre por unsigned long, por si manejamos un gran volumen de archivos que no entre en int. &lt;gonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>28</strong> lines of code changed in <span class="files">2 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+20&#160;-18)</span>,
        merge.h&#160;<span class="change">(+8&#160;-8)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="30"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-22 18:10</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">144</span></span>
  </dt>
  <dd>
    <p class="comment">
a ver<br />

    </p>
    <p class="commitdetails"><strong>19</strong> lines of code changed in <span class="files">3 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+8&#160;-8)</span>,
        merge.h&#160;<span class="change">(+6&#160;-6)</span>,
        prueba_merge.c&#160;<span class="change">(+5&#160;-5)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="29"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-22 14:06</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">142</span></span>
  </dt>
  <dd>
    <p class="comment">
Borro compilados. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>0</strong> lines of code changed in <span class="files">7 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        cola.h&#160;<span class="del">(del)</span>,
        heap.h&#160;<span class="del">(del)</span>,
        lista.h&#160;<span class="del">(del)</span>,
        pila.h&#160;<span class="del">(del)</span>,
        termino.h&#160;<span class="del">(del)</span>,
        utilidades.h&#160;<span class="del">(del)</span>,
        vector_dinamico.h&#160;<span class="del">(del)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="28"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-22 14:02</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">141</span></span>
  </dt>
  <dd>
    <p class="comment">
Automatizo los archivos que se abren para mergear. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>14</strong> lines of code changed in <span class="files">1 file</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        prueba_merge.c&#160;<span class="change">(+14&#160;-10)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="27"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-22 12:32</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">133</span></span>
  </dt>
  <dd>
    <p class="comment">
Ahi creo que pude abstraer el buffer afuera del merge, para que quede mas ordenado. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>2</strong> lines of code changed in <span class="files">2 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+1&#160;-176)</span>,
        merge.h&#160;<span class="change">(+1)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="26"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-22 11:49</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">132</span></span>
  </dt>
  <dd>
    <p class="comment">
Vuelvo a poner el print que dice la cantidad de terminos procesados una vez terminado el merge. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>39</strong> lines of code changed in <span class="files">3 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+23&#160;-15)</span>,
        merge.h&#160;<span class="change">(+5&#160;-5)</span>,
        prueba_merge.c&#160;<span class="change">(+11&#160;-14)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="25"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-22 11:40</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">131</span></span>
  </dt>
  <dd>
    <p class="comment">
Abstraigo la estructura buffer, que uso en el merge, para no tener que pasar mil cosas por parametro.<br />
Intente hacer un tda, pero el makefile me pide millones de dependencias, me dio paja y la termine definiendo<br />
directamente en el merge. Igualmente es una estructura tan especifica que solo se usa ahi, aunque quede feo &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>137</strong> lines of code changed in <span class="files">3 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+135&#160;-66)</span>,
        merge.h&#160;<span class="change">(-13)</span>,
        prueba_merge.c&#160;<span class="change">(+2&#160;-2)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="24"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-22 10:39</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">129</span></span>
  </dt>
  <dd>
    <p class="comment">
Agrego el calculo de la cantidad de terminos procesados por el merge. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>22</strong> lines of code changed in <span class="files">3 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+17&#160;-7)</span>,
        merge.h&#160;<span class="change">(+2&#160;-2)</span>,
        prueba_merge.c&#160;<span class="change">(+3&#160;-2)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="23"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-22 07:25</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">125</span></span>
  </dt>
  <dd>
    <p class="comment">
Ahi modifique el parser para que escriba en el mismo formato que el merge. Faltaria agregar el manejo de archivo como ints, y escribir un archivo con las rutas. Cosa de que sea mas facil escribir la matriz. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>3</strong> lines of code changed in <span class="files">1 file</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+3)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="22"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-22 07:10</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">124</span></span>
  </dt>
  <dd>
    <p class="comment">
Agrego una linea de cantidad de documentos en los que aparece el término. Ahora lo agrego en el parser y me fijo como anda, a ver si entendi como ufnciona. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>10</strong> lines of code changed in <span class="files">1 file</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+10&#160;-3)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="21"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-21 17:17</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">122</span></span>
  </dt>
  <dd>
    <p class="comment">
Modifico un poco mi makefile del merge. Hay algun Make Close que borra el lista.h, no se cual, pero se borra. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>17</strong> lines of code changed in <span class="files">1 file</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        termino.h&#160;<span class="change">(+17&#160;-70)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="20"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-21 17:10</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">121</span></span>
  </dt>
  <dd>
    <p class="comment">
Bueno. Ahi arregle las dependencias. Te odio lucas por hacer una estructura con el nombre exactamente igual al mio. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>75</strong> lines of code changed in <span class="files">3 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+31&#160;-31)</span>,
        merge.h&#160;<span class="change">(+4&#160;-4)</span>,
        prueba_merge.c&#160;<span class="change">(+40&#160;-40)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="19"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-20 06:47</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">111</span></span>
  </dt>
  <dd>
    <p class="comment">
Saco una funcionalidad inutil. &lt;gONCHUb&gt;<br />

    </p>
    <p class="commitdetails"><strong>15</strong> lines of code changed in <span class="files">3 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+7&#160;-14)</span>,
        merge.h&#160;<span class="change">(+3&#160;-3)</span>,
        prueba_merge.c&#160;<span class="change">(+5&#160;-8)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="18"></a>
    <a href="user_lucas.006@live.com.ar.html" class="author">lucas.006@live.com.ar</a>
    <span class="date">2012-09-20 06:36</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">110</span></span>
  </dt>
  <dd>
    <p class="comment">
Lucas - agrego todo, tal vez cuando filtré los ejecutables, etc, me morfe algo
    </p>
    <p class="commitdetails"><strong>131</strong> lines of code changed in <span class="files">8 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        abb_avl.h&#160;<span class="new">(new&#160;61)</span>,
        cola.h&#160;<span class="new">(new)</span>,
        heap.h&#160;<span class="new">(new)</span>,
        lista.h&#160;<span class="new">(new)</span>,
        pila.h&#160;<span class="new">(new)</span>,
        termino.h&#160;<span class="new">(new&#160;70)</span>,
        utilidades.h&#160;<span class="new">(new)</span>,
        vector_dinamico.h&#160;<span class="new">(new)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="17"></a>
    <a href="user_lucas.006@live.com.ar.html" class="author">lucas.006@live.com.ar</a>
    <span class="date">2012-09-18 18:59</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">109</span></span>
  </dt>
  <dd>
    <p class="comment">
Lucas - Funcionalidad agregada: posibilidad de extender a N-gramas. Falta probar / determinar el MI para N-gramas, pero funciona para 2, asi q inductivamente digo q anda.
    </p>
    <p class="commitdetails"><strong>21</strong> lines of code changed in <span class="files">2 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+7&#160;-1)</span>,
        prueba_merge.c&#160;<span class="change">(+14&#160;-14)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="16"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-18 06:32</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">108</span></span>
  </dt>
  <dd>
    <p class="comment">
Agrego la funcionalidad de que el merge calcule la maxima frecuencia (aunque me parece que no era esa la que<br />
necesitabamos, despues lo corrijo). Lo mas importante es que hacia mucho que no pasaba valgrind y hay<br />
un free por algun lado que no hago. Estuve media hora y no lo encontre. Es solo en un lugar segun valgrind.<br />
Ya no se donde buscar. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>43</strong> lines of code changed in <span class="files">3 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+19&#160;-8)</span>,
        merge.h&#160;<span class="change">(+3&#160;-3)</span>,
        prueba_merge.c&#160;<span class="change">(+21&#160;-9)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="15"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-12 07:15</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">88</span></span>
  </dt>
  <dd>
    <p class="comment">
Ahi subo el test para los archivos que me paso lucas. Una aclaracion, el parser identifica a los \n como una palabra, fijate que aparecen al principio de cada documento parseado. No se si esta bueno eso, debatamoslo, capaz haya que pasarselo al strtok. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>8</strong> lines of code changed in <span class="files">1 file</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        prueba_merge.c&#160;<span class="change">(+8&#160;-6)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="14"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-11 04:25</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">84</span></span>
  </dt>
  <dd>
    <p class="comment">
Agrego el TAD termino. Siguen pasando mis pruebas. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>21</strong> lines of code changed in <span class="files">3 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+19&#160;-194)</span>,
        merge.h&#160;<span class="change">(+1&#160;-71)</span>,
        prueba_merge.c&#160;<span class="change">(+1)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="13"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-11 03:55</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">83</span></span>
  </dt>
  <dd>
    <p class="comment">
Emprolijo un poco algunas funciones. Voy a ver si no se rompe todo intentando hacer un archivo aparte<br />
para el TAD que defini dentro de mis arhivo.Podria ser util a la hora de llenar la matriz el TAD. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>88</strong> lines of code changed in <span class="files">3 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+32&#160;-2)</span>,
        merge.h&#160;<span class="change">(+20)</span>,
        prueba_merge.c&#160;<span class="change">(+36&#160;-33)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="12"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-10 19:07</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">80</span></span>
  </dt>
  <dd>
    <p class="comment">
Bueno, ahi probe el merge para 3 subarchivos que me genere en base a uno de lucas. Parece andar perfecto.<br />
Cuando haya mas cosas parseadas pruebo de nuevo. La prueba es visual, esta si que ni en pedo la hago<br />
automatica. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>38</strong> lines of code changed in <span class="files">3 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+7&#160;-15)</span>,
        merge.h&#160;<span class="change">(+1&#160;-1)</span>,
        prueba_merge.c&#160;<span class="change">(+30)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="11"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-10 18:28</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">79</span></span>
  </dt>
  <dd>
    <p class="comment">
Una prueba mas que pasa que me costo. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>20</strong> lines of code changed in <span class="files">2 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+4&#160;-2)</span>,
        prueba_merge.c&#160;<span class="change">(+16&#160;-5)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="10"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-10 06:30</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">78</span></span>
  </dt>
  <dd>
    <p class="comment">
Agregue mas pruebas, me falta todvia. Tengo una que no pasa pero por que no tuve tiempo. Cuando veulva de la facu sigo. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>149</strong> lines of code changed in <span class="files">3 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+26&#160;-14)</span>,
        merge.h&#160;<span class="change">(+2)</span>,
        prueba_merge.c&#160;<span class="change">(+121)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="9"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-10 05:16</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">76</span></span>
  </dt>
  <dd>
    <p class="comment">
Saco unos archivos que no deberian estar. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>2</strong> lines of code changed in <span class="files">2 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        cola.h&#160;<span class="del">(del)</span>,
        prueba_merge.c&#160;<span class="change">(+2)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="8"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-10 05:14</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">75</span></span>
  </dt>
  <dd>
    <p class="comment">
Progreso parcial de las pruebas. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>151</strong> lines of code changed in <span class="files">2 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+16&#160;-15)</span>,
        prueba_merge.c&#160;<span class="change">(+135)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="7"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-10 03:41</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">72</span></span>
  </dt>
  <dd>
    <p class="comment">
Solucionado, sigo probando. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>72</strong> lines of code changed in <span class="files">4 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        cola.h&#160;<span class="change">(+1&#160;-1)</span>,
        merge.c&#160;<span class="change">(+52&#160;-19)</span>,
        merge.h&#160;<span class="change">(+7&#160;-3)</span>,
        prueba_merge.c&#160;<span class="change">(+12&#160;-10)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="6"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-10 03:08</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">71</span></span>
  </dt>
  <dd>
    <p class="comment">
Bueno, estoy teniendo problemas con el Makefile, necesito ayuda.<br />
Cuando quiero compilar se me mete en un loop y no termina nunca.<br />
Voy a seguir escribiendo las pruebas con el supuesto funcionamiento.<br />
Como que se pone a meterse y a hacer makes y se queda alternando<br />
entre algunos y nunca sale.<br />
&lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>43</strong> lines of code changed in <span class="files">2 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+1&#160;-1)</span>,
        prueba_merge.c&#160;<span class="change">(+42)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="5"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-09 17:09</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">70</span></span>
  </dt>
  <dd>
    <p class="comment">
Actualizo el .h y saco las pruebas que probaban cosas del modelo anterior. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>52</strong> lines of code changed in <span class="files">3 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+2&#160;-2)</span>,
        merge.h&#160;<span class="change">(+45&#160;-16)</span>,
        prueba_merge.c&#160;<span class="change">(+5&#160;-174)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="4"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-09 16:59</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">69</span></span>
  </dt>
  <dd>
    <p class="comment">
Ahi modifique el codigo para que utilice el heap. Punto a tener en cuenta,<br />
ahora que ya hicimos el parser y modificamos la funcion del avl para<br />
que reciba mas extras y cosas asi quedo una cosa horrible. No quise<br />
perder tiempo y yo a la hora de recorrer un avl tardare mas. Me pierdo<br />
con tantos punteros a void. De ultima si es un problema le meto mas<br />
ganas, pero lo recorri con el iterador externo, que, btw, se llama<br />
iter_in xD. no lo cambies ahora que se me caga todo, no tengo refactor jaja.&lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>44</strong> lines of code changed in <span class="files">1 file</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+44&#160;-7)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="3"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-09 15:30</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">68</span></span>
  </dt>
  <dd>
    <p class="comment">
Progreso parcial del heap. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>110</strong> lines of code changed in <span class="files">1 file</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+110&#160;-55)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="2"></a>
    <a href="user_gonchu.b@gmail.com.html" class="author">gonchu.b@gmail.com</a>
    <span class="date">2012-09-09 13:18</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">65</span></span>
  </dt>
  <dd>
    <p class="comment">
Bueno avance un poco con el merge ahora que ya tenemos las estructuras bastantes definidas. Me falta probar todo, seguramente no ande un carajo, asi que mañana me pongo a probar. &lt;GonchuB&gt;<br />

    </p>
    <p class="commitdetails"><strong>300</strong> lines of code changed in <span class="files">2 files</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        merge.c&#160;<span class="change">(+232&#160;-187)</span>,
        merge.h&#160;<span class="change">(+68&#160;-50)</span>
      </li>
    </ul>
  </dd>

  <dt><a name="1"></a>
    <a href="user_lucas.006@live.com.ar.html" class="author">lucas.006@live.com.ar</a>
    <span class="date">2012-09-07 12:26</span>
    <span class="revisionNumberOuter">Rev.: <span class="revisionNumberInner">55</span></span>
  </dt>
  <dd>
    <p class="comment">
Lucas - Parser. Cambios menores y agrego "." como separador de terminos
    </p>
    <p class="commitdetails"><strong>53</strong> lines of code changed in <span class="files">1 file</span>:</p>
    <ul class="commitdetails">
      <li>
        <strong>datostp2012/src/utilidades/merge</strong>:
        cola.h&#160;<span class="new">(new&#160;53)</span>
      </li>
    </ul>
  </dd>

</dl>

<p>(8 more)</p>
</div><div id="generatedby">Generated by <a href="http://www.statsvn.org">StatSVN</a> 0.7.0</div>
</body>
</html>